From b6267b196111e6c20b431ba0690ddd25333e1f8a Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Fri, 30 Apr 2004 16:05:31 +0000 Subject: [PATCH] bitkeeper revision 1.879.1.7 (4092794b4ICZMqVU5M2Y8Y-gxy4XLw) Fix Mark's PCI updates so that my test system (Dell PE2650) still works with aacraid driver. --- xen/common/physdev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/common/physdev.c b/xen/common/physdev.c index b57c6b564b..0cc2654e8a 100644 --- a/xen/common/physdev.c +++ b/xen/common/physdev.c @@ -417,7 +417,7 @@ static long pci_cfgreg_read(int bus, int dev, int func, int reg, * all 1s. In this case the domain has no read access, which should * also look like the device is non-existent. */ *val = 0xFFFFFFFF; - return 0; + return ret; /* KAF: error return seems to matter on my test machine. */ } /* Fake out read requests for some registers. */ @@ -637,7 +637,6 @@ void physdev_init_dom0(struct task_struct *p) /* Skip bridges and other peculiarities for now. */ if ( dev->hdr_type != PCI_HEADER_TYPE_NORMAL ) continue; - pdev = kmalloc(sizeof(phys_dev_t), GFP_KERNEL); pdev->dev = dev; pdev->flags = ACC_WRITE; @@ -647,8 +646,7 @@ void physdev_init_dom0(struct task_struct *p) } else { - printk("Hiding PCI device %s from DOM0\n", - dev->slot_name); + printk("Hiding PCI device %s from DOM0\n", dev->slot_name); } } } -- 2.30.2